Fix merge mistake.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2a2b5b9bc2d26c4df05845ea7b50e3abfd8ad001..e908b8f2761c4de671db414305f6e389a3c3b2d2 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -63,11 +63,6 @@
        * gnus-win.el (gnus-configure-frame, gnus-all-windows-visible-p):
        Prefer fboundp to functionp so it works with macros as well.
 
-2008-03-19  Glenn Morris  <rgm@gnu.org>
-
-       * tls.el (open-tls-stream): Restore use of `tls-end-of-info'.
-       Accidentally removed in the sync process with Emacs.
-
 2008-03-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.el (message-alter-recipients-discard-bogus-full-name): New